From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 4 Jun 2012 23:32:06 +0000 (-0400)
Subject: shell-recorder: Remove the ability to pause the timeline
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5943
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f0474ffccc6921872827a1595745122933015421;p=gnome-shell.git

shell-recorder: Remove the ability to pause the timeline

https://bugzilla.gnome.org/show_bug.cgi?id=677434
---

diff --git a/src/shell-recorder.c b/src/shell-recorder.c
index 9abf706e5..91f4884f4 100644
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@@ -20,7 +20,6 @@
 
 typedef enum {
   RECORDER_STATE_CLOSED,
-  RECORDER_STATE_PAUSED,
   RECORDER_STATE_RECORDING
 } RecorderState;
 
@@ -74,9 +73,8 @@ struct _ShellRecorder {
   RecorderPipeline *current_pipeline; /* current pipeline */
   GSList *pipelines; /* all pipelines */
 
-  GstClockTime start_time; /* When we started recording (adjusted for pauses) */
+  GstClockTime start_time; /* When we started recording */
   GstClockTime last_frame_time; /* Timestamp for the last frame */
-  GstClockTime pause_time; /* When the pipeline was paused */
 
   /* GSource IDs for different timeouts and idles */
   guint redraw_timeout;
@@ -1615,8 +1613,7 @@ shell_recorder_set_pipeline (ShellRecorder *recorder,
  * shell_recorder_record:
  * @recorder: the #ShellRecorder
  *
- * Starts recording, or continues a recording that was previously
- * paused. Starting the recording may fail if the output file
+ * Starts recording, Starting the recording may fail if the output file
  * cannot be opened, or if the output stream cannot be created
  * for other reasons. In that case a warning is printed to
  * stderr. There is no way currently to get details on how
@@ -1637,22 +1634,11 @@ shell_recorder_record (ShellRecorder *recorder)
   g_return_val_if_fail (recorder->stage != NULL, FALSE);
   g_return_val_if_fail (recorder->state != RECORDER_STATE_RECORDING, FALSE);
 
-  if (recorder->current_pipeline)
-    {
-      /* Adjust the start time so that the times in the stream ignore the
-       * pause
-       */
-      recorder->start_time = recorder->start_time + (get_wall_time() - recorder->pause_time);
-      recorder->last_frame_time = 0;
-    }
-  else
-    {
-      if (!recorder_open_pipeline (recorder))
-        return FALSE;
+  if (!recorder_open_pipeline (recorder))
+    return FALSE;
 
-      recorder->start_time = get_wall_time();
-      recorder->last_frame_time = 0;
-    }
+  recorder->start_time = get_wall_time();
+  recorder->last_frame_time = 0;
 
   recorder->state = RECORDER_STATE_RECORDING;
   recorder_add_update_pointer_timeout (recorder);
@@ -1672,62 +1658,37 @@ shell_recorder_record (ShellRecorder *recorder)
 }
 
 /**
- * shell_recorder_pause:
+ * shell_recorder_close:
  * @recorder: the #ShellRecorder
  *
- * Temporarily stop recording. If the specified filename includes
- * the %c escape, then the stream is closed and a new stream with
- * an incremented counter will be created. Otherwise the stream
- * is paused and will be continued when shell_recorder_record()
- * is next called.
+ * Stops recording. It's possible to call shell_recorder_record()
+ * again to reopen a new recording stream, but unless change the
+ * recording filename, this may result in the old recording being
+ * overwritten.
  */
 void
-shell_recorder_pause (ShellRecorder *recorder)
+shell_recorder_close (ShellRecorder *recorder)
 {
   g_return_if_fail (SHELL_IS_RECORDER (recorder));
-  g_return_if_fail (recorder->state == RECORDER_STATE_RECORDING);
+  g_return_if_fail (recorder->state != RECORDER_STATE_CLOSED);
 
-  recorder_remove_update_pointer_timeout (recorder);
   /* We want to record one more frame since some time may have
    * elapsed since the last frame
    */
   clutter_actor_paint (CLUTTER_ACTOR (recorder->stage));
 
-  if (recorder->filename_has_count)
-    recorder_close_pipeline (recorder);
-
-  recorder->state = RECORDER_STATE_PAUSED;
-  recorder->pause_time = get_wall_time();
+  recorder_remove_update_pointer_timeout (recorder);
+  recorder_close_pipeline (recorder);
 
   /* Queue a redraw to remove the recording indicator */
   clutter_actor_queue_redraw (CLUTTER_ACTOR (recorder->stage));
 
   if (recorder->repaint_hook_id != 0)
-  {
-    clutter_threads_remove_repaint_func (recorder->repaint_hook_id);
-    recorder->repaint_hook_id = 0;
-  }
-}
-
-/**
- * shell_recorder_close:
- * @recorder: the #ShellRecorder
- *
- * Stops recording. It's possible to call shell_recorder_record()
- * again to reopen a new recording stream, but unless change the
- * recording filename, this may result in the old recording being
- * overwritten.
- */
-void
-shell_recorder_close (ShellRecorder *recorder)
-{
-  g_return_if_fail (SHELL_IS_RECORDER (recorder));
-  g_return_if_fail (recorder->state != RECORDER_STATE_CLOSED);
-
-  if (recorder->state == RECORDER_STATE_RECORDING)
-    shell_recorder_pause (recorder);
+    {
+      clutter_threads_remove_repaint_func (recorder->repaint_hook_id);
+      recorder->repaint_hook_id = 0;
+    }
 
-  recorder_remove_update_pointer_timeout (recorder);
   recorder_remove_redraw_timeout (recorder);
   recorder_close_pipeline (recorder);